From 2f68ed7ecb4c87d7fe79ee8fa3ce6008a4c6698b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 23 Aug 2013 11:31:45 -0400 Subject: [PATCH] * lisp/textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away text-properties. --- lisp/ChangeLog | 3 +++ lisp/textmodes/fill.el | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47c1eb76726..3630a389a4f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-08-23 Stefan Monnier + * textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away + text-properties (bug#15155). + * calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't exist any more. (calc-keypad-redraw): Remove unused var `pad'. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 5b6d5f359e6..119b4b04593 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -220,7 +220,7 @@ Remove indentation from each line." (let ((str (or (and adaptive-fill-function (funcall adaptive-fill-function)) (and adaptive-fill-regexp (looking-at adaptive-fill-regexp) - (match-string-no-properties 0))))) + (match-string 0))))) (if (>= (+ (current-left-margin) (length str)) (current-fill-column)) ;; Death to insanely long prefixes. nil -- 2.30.2